Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/piwik

Author: t3chguy

docs/translating.md

@@ -6,32 +6,37 @@
 - Be able to understand English
 - Be able to understand the language you want to translate riot-web into
 
+## Step 0: Join #riotweb-translations:matrix.org
+
+1. Come and join https://riot.im/develop/#/room/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
+
 ## Step 1: Preparing your Weblate Profile
 
 1. Head to https://translate.nordgedanken.de and register either via Github or email
-2. After register check if you got a email to verify your account and click the link (if there is none head to step 1.4)
+2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
 3. Log into weblate
 4. Head to https://translate.nordgedanken.de/accounts/profile/ and select the languages you know and maybe another language you know too.
 6. Head to https://translate.nordgedanken.de/accounts/profile/#subscriptions and select Riot Web as Project
 
 ## How to check if your language already is being translated
 
-Go to https://translate.nordgedanken.de/projects/riot-web/ and in all 3 sub projects if your language is listed.
-If it is listed go to Step 2a if not go to Step 2b
+Go to https://translate.nordgedanken.de/projects/riot-web/ and visit the 2 sub-projects.
+If your language is listed go to Step 2a and if not go to Step 2b
 
 ## Step 2a: Helping on existing languages.
 
 1. Head to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
 2. Click on the ``translate`` button on the right side of your language
-3. Fill in the translations in the writeable field. You will see the original English string and the String of your second language above.
+3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
 
 Head to the explanations under Steb 2b
 
 ## Step 2b: Adding a new language
 
 1. Go to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
 2. Click the ``Start new language`` button at the bottom
-3. Select our language
+3. Select a language
 4. Start translating like in 2a.3
 5. Repeat these steps for the other projects which are listed at the link of step 2b.1
 
@@ -41,16 +46,19 @@ The green button let you save our translations directly. Please only use it if y
 
 ### What means the yellow button under the text field?
 
-The yellow button has to be used if you are unsure about the translation but you have a rough idea. It ads a new suggestion to the string which can than be reviewed by others.
+The yellow button has to be used if you are unsure about the translation but you have a rough idea. It adds a new suggestion to the string which can than be reviewed by others.
 
 ### What are "%(something)s"?
 
-These things are variables that are filled inside the code. They can be room names, usernames or similiar. If you find one use it for changing the word order but do not delete it as thing are missing if you do so.
+These things are variables that are expanded when displayed by Riot. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.
+
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `<a href="/somewhere">` and `</a>`.  You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.
 
 ### "I want to come back to this string. How?"
 
 You can use inside the translation field "Review needed" checkbox. It will be shown as Strings that need to be reviewed.
 
+
 ### Further reading
 
-The official Doc provides some more in-deepth explanation on how to do translations and talks about do and don't's. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
+The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html

package.json

@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.8",
-    "matrix-react-sdk": "0.8.9",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",
@@ -104,6 +104,7 @@
     "emojione": "^2.2.7",
     "eslint": "^3.14.0",
     "eslint-config-google": "^0.7.1",
+    "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-react": "^6.9.0",
     "expect": "^1.16.0",

scripts/fetch-develop.deps.sh

@@ -40,11 +40,13 @@ dodep matrix-org matrix-react-sdk
 mkdir -p node_modules
 cd node_modules
 
+rm -r matrix-js-sdk 2> /dev/null
 ln -s ../matrix-js-sdk ./
 pushd matrix-js-sdk
 npm install
 popd
 
+rm -r matrix-react-sdk 2> /dev/null
 ln -s ../matrix-react-sdk ./
 pushd matrix-react-sdk
 mkdir -p node_modules

scripts/jenkins.sh

@@ -34,11 +34,9 @@ npm run lintall -- -f checkstyle -o eslint.xml || true
 
 rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
 
- # node_modules deps from 'npm install' don't have a .git dir so can't
- # rev-parse; but they do set the commit in package.json under 'gitHead' which
- # we're grabbing here.
-REACT_SHA=$(grep 'gitHead' node_modules/matrix-react-sdk/package.json | cut -d \" -f 4 | head -c 12)
-JSSDK_SHA=$(grep 'gitHead' node_modules/matrix-js-sdk/package.json | cut -d \" -f 4 | head -c 12)
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
 
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
 

src/components/views/settings/Notifications.js

@@ -714,7 +714,7 @@ module.exports = React.createClass({
                     {masterPushRuleDiv}
 
                     <div className="mx_UserSettings_notifTable">
-                        { _t('All notifications are currently disabled for all targets') }.
+                        { _t('All notifications are currently disabled for all targets.') }.
                     </div>
                 </div>
             );

src/i18n/strings/be.json

@@ -16,7 +16,7 @@
     "Directory": "Каталог",
     "Dismiss": "Aдхіліць",
     "Download this file": "Спампаваць гэты файл",
-    "Drop here to %(verb)s": "Перацягнуць сюды %(verb)s",
+    "Drop here %(toAction)s": "Перацягнуць сюды %(toAction)s",
     "Enable audible notifications in web client": "Ўключыць гукавыя апавяшчэнні ў вэб-кліенце",
     "Enable desktop notifications": "Ўключыць апавяшчэнні на працоўным стале",
     "Enable email notifications": "Ўключыць паведамлення па электроннай пошце",
@@ -34,7 +34,7 @@
     "Failed to get protocol list from Home Server": "Не ўдалося атрымаць спіс пратаколаў ад хатняга сервера",
     "Failed to get public room list": "Не ўдалося атрымаць спіс агульных пакояў",
     "Failed to join the room": "Не ўдалося далучыцца да пакоя",
-    "Failed to remove tag %(prevTag)s from room": "Не ўдалося выдаліць %(prevTag)s з пакоя",
+    "Failed to remove tag %(tagName)s from room": "Не ўдалося выдаліць %(tagName)s з пакоя",
     "Failed to set direct chat tag": "Не ўдалося ўсталяваць тэг прамога чата",
     "Failed to set Direct Message status of room": "Не ўдалося ўсталяваць статут прамога паведамлення пакою",
     "Favourite": "Улюбёнае",

src/i18n/strings/de_DE.json

@@ -81,7 +81,7 @@
     "On": "An",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie sind in Riot nicht anpassbar gelten aber trotzdem",
     " to room": " an Raum",
-    "Drop here to %(verb)s": "%(verb)s hierher ziehen",
+    "Drop here %(toAction)s": "%(toAction)s hierher ziehen",
     "All messages": "Alle Nachrichten",
     "All messages (loud)": "Alle Nachrichten (laut)",
     "Cancel Sending": "Senden abbrechen",
@@ -90,7 +90,7 @@
     "Download this file": "Datei Herunterladen",
     "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums %(errCode)s aus deiner Liste ist fehlgeschlagen",
-    "Failed to remove tag %(prevTag)s from room": "Das Entfernen des Tags %(prevTag)s für den Raum ist fehlgeschlagen",
+    "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to set direct chat tag": "Fehler beim setzen der Direct Chat Kennzeichnung",
     "Mentions only": "Nur, wenn du erwähnt wirst",
     "Mute": "Lautlos",
@@ -117,5 +117,16 @@
     "Sunday": "Sonntag",
     "Monday": "Montag",
     "Yesterday": "Gestern",
-    "Welcome page": "Willkommensseite"
+    "Welcome page": "Willkommensseite",
+    "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen",
+    "Call invitation": "Anruf-Einladung",
+    "Enter keywords separated by a comma:": "Trage Schlagworte, mit Komma getrennt, ein",
+    "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten",
+    "Messages containing my user name": "Nachrichten, die meinen Nutzernamen enthalten",
+    "Messages in group chats": "Nachrichten in Chat-Gruppen",
+    "Messages in one-to-one chats": "Nachrichten in Eins-zu-Eins-Chats",
+    "Messages sent by bot": "Nachrichten von Bots",
+    "more": "mehr",
+    "When I'm invited to a room": "Wenn ich in einen Raum eingeladen werde",
+    "customServer_text": "Du kannst die erweiterten Server-Optioen nutzen um dich an anderen Matrix-Servern mittels anderer Heimserver-URL anzumelden. <br/>Dies erlaubt dir Riot mit einem existierendem Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server setzen, aber du wirst dann nicht in der Lage sein, Nutzer per E-Mail-Adresse einzuladen oder selbst mit E-Mail-Adresse eingeladen zu werden."
 }

src/i18n/strings/en_EN.json

@@ -19,13 +19,13 @@
   "Directory": "Directory",
   "Dismiss": "Dismiss",
   "Download this file": "Download this file",
-  "Drop here to %(verb)s": "Drop here to %(verb)s",
+  "Drop here %(toAction)s": "Drop here %(toAction)s",
   "Enable audible notifications in web client": "Enable audible notifications in web client",
   "Enable desktop notifications": "Enable desktop notifications",
   "Enable email notifications": "Enable email notifications",
   "Enable notifications for this account": "Enable notifications for this account",
   "Enable them now": "Enable them now",
-  "Enter keywords separated by a comma": "Enter keywords separated by a comma",
+  "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
   "Error": "Error",
   "Error saving email notification preferences": "Error saving email notification preferences",
   "#example": "#example",
@@ -37,7 +37,7 @@
   "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
   "Failed to get public room list": "Failed to get public room list",
   "Failed to join the room": "Failed to join the room",
-  "Failed to remove tag %(prevTag)s from room": "Failed to remove tag %(prevTag)s from room",
+  "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
   "Failed to set direct chat tag": "Failed to set direct chat tag",
   "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
   "Favourite": "Favourite",

src/i18n/strings/fi.json

@@ -0,0 +1,3 @@
+{
+    "Sunday": "Sunnuntai"
+}

src/i18n/strings/fr.json

@@ -3,7 +3,7 @@
     "All messages": "Tous les messages",
     "All messages (loud)": "Tous les messages (fort)",
     "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
-    "An error occurred whilst saving your email notification preferences": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail",
     "Cancel Sending": "Annuler l'envoi",
     "Can't update user notification settings": "Impossible de mettre à jour les notifications utilisateur",
     "Close": "Fermer",
@@ -16,13 +16,13 @@
     "Directory": "Répertoire",
     "Dismiss": "Rejeter",
     "Download this file": "Télécharger ce fichier",
-    "Drop here to %(verb)s": "Déposer ici pour %(verb)s",
+    "Drop here %(toAction)s": "Déposer ici pour %(toAction)s",
     "Enable audible notifications in web client": "Activer les notifications sonores pour le client web",
     "Enable desktop notifications": "Activer les notifications de bureau",
     "Enable email notifications": "Activer les notifications par e-mail",
     "Enable notifications for this account": "Activer les notifications pour ce compte",
     "Enable them now": "Les activer maintenant",
-    "Enter keywords separated by a comma": "Entrez les mots clés séparés par une virgule",
+    "Enter keywords separated by a comma:": "Entrez les mots clés séparés par une virgule",
     "Error": "Erreur",
     "Error saving email notification preferences": "Erreur lors de la sauvegarde des notifications par email",
     "#example": "#exemple",
@@ -34,7 +34,7 @@
     "Failed to get protocol list from Home Server": "Echec lors de la récupération depuis le serveur maison",
     "Failed to get public room list": "Echec lors de la récupération de la liste des salons publics",
     "Failed to join the room": "Échec de l'adhésion au salon",
-    "Failed to remove tag %(prevTag)s from room": "Échec dans la suppression de l’étiquette %(prevTag)s du salon",
+    "Failed to remove tag %(tagName)s from room": "Échec dans la suppression de l’étiquette %(tagName)s du salon",
     "Failed to set direct chat tag": "Échec dans l'attribution d'une étiquette dans le chat direct",
     "Favourite": "Favoris",
     "Operation failed": "L'opération a échoué",
@@ -116,5 +116,9 @@
     "World readable": "Visible par tout le monde",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même",
     "Guests can join": "Ouvert aux invités",
-    " to room": " au salon"
+    " to room": " au salon",
+    "Advanced notification settings": "Paramètres de notifications avancés",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications mail.",
+    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse différente pour Home serveur.<br/>Cela permet d'utiliser Riot avec un compte existant sur un Home serveur différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots clés suivant répondent à des critères qui ne peuvent pas être affichés ici :"
 }