Merge branch 'master' of github.com:reality/depressionbot

modules/reddit/strings.json

@@ -1,14 +1,18 @@
 {
     "about_subreddit": {
-        "en": "[{display_name} has {subscribers} subscribers ({active} active)]"
+        "en": "[{display_name} has {subscribers} subscribers ({active} active)]",
+        "cy": "[Mae {display_name} wedi {subscribers} subscribers ({active} active)]"
     },
     "about_post": {
-        "en": "[Post by {poster} in {subreddit} — Comments: {comments}, Score: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)] — {url}"
+        "en": "[Post by {poster} in {subreddit} — Comments: {comments}, Score: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)] — {url}",
+        "cy": "[Postio gan {poster} yn {subreddit} - Sylwadau: {comments}, Sgôr: {score} (\u00039]▲{up}\u000f|\u000312{down}▼\u000f)] — {url}"
     },
     "about_comment": {
-        "en": "[Comment by {poster} in {subreddit} — Score: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)]"
+        "en": "[Comment by {poster} in {subreddit} — Score: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)]",
+        "cy": "[Sylw gan {poster} yn {subreddit} - Sgôr: {score} (\u00039▲{up}\u000f|\u000312{down}▼\u000f)]"
     },
     "nsfw": {
-        "en": "[NSFW]"
+        "en": "[NSFW]",
+        "cy": "[Anniogel Ar Gwaith (AAG)]"
     }
 }

modules/report/strings.json

@@ -2,21 +2,25 @@
     "report": {
         "en": "Attention: {reporter} has reported {reported} in {channel}. The reason given was: \"{reason}.\"",
         "na'vi": "{reporter}ìl fpìl futa {reported} fe' lu taluna {reason}.",
+        "cy": "Sylw! {reporter} wedi adrodd {reported} yn {channel}. Y rheswm a rhoddwyd oedd: \"{reason}.\"",
         "nl": "Waarschuwing: {reporter} heeft {reported} aangegeven in {channel}. De reden die gegeven werd was: \"{reason}.\""
     },
     "reported": {
         "en": "Thank you, {reported} has been reported to the channel administrators.",
         "na'vi": "Irayo si ngari, fìtsengìri ayeyktan omum teri {reported}it set.",
+        "cy": "Diolch, {reported} wedi cael ei adrodd i'r gweinyddwyr sianel.",
         "nl": "Bedankt, {reported} is aangegeven bij de administrators."
     },
     "user_not_found": {
         "en": "{reported} isn't a known user in {channel}.",
         "na'vi": "Oel ke omum {reported}it mì {channel}.",
+        "cy": "Nid yw {reported} yn ddefnyddiwr hysbys yn {channel}.",
         "nl": "{reported} is geen bestaande gebruiker in {channel}."
     },
     "not_in_channel": {
         "en": "I am not present in {channel}.",
         "na'vi": "Oel {channel}it ke tok.",
+        "cy": "Dydw i ddim yn bresennol yn {channel}.",
         "nl": "Ik ben niet aanwezig in {channel}."
     }
 }

modules/spotify/strings.json

@@ -1,19 +1,24 @@
 {
   "artist": {
-    "en": "[artist] {artist}"
+    "en": "[artist] {artist}",
+    "cy": "[cyfansoddwr] {artist}"
   },
   "album": {
-    "en": "[album] {artist} – {album}"
+    "en": "[album] {artist} – {album}",
+    "cy": "[albwm] {artist} - {album}"
   },
   "track": {
-    "en": "[track] {artist} – {track} (from {album})"
+    "en": "[track] {artist} – {track} (from {album})",
+    "cy": "[trac] {artist} - {track} (o'r albwm: {album})"
   },
   "found": {
-    "en": "[{url}] {artist} – {track} (from {album})"
+    "en": "[{url}] {artist} – {track} (from {album})",
+    "cy": "[{url}] {artist} - {track} (o'r albwm: {album})"
   },
   "not-found": {
     "en": "{No results.",
     "na'vi": "{s}, Oel ke tsun rivum ayuoti.",
+    "cy": "Dim canlyniadau.",
     "nl": "Geen resultaten."
   }
 }

modules/users/strings.json

@@ -2,31 +2,37 @@
     "alias": {
         "en": "{alias} is an alias of {user}",
         "na'vi": "ayfko syaw {user} {alias} nìteng",
+        "cy": "{alias} ydy enw arall o {user}",
         "nl": "{alias} is een alias van {user}"
     }, 
     "primary": {
         "en": "{user} is a primary user with {count} aliases, ",
         "na'vi": "{user} lu txin ulte {count}a stxo lu poru, ",
+        "cy": "Mae {user} yn ddefnyddiwr gynradd gyda {count} enwau eraill, ",
         "nl": "{user} is een primaire gebruiker met {count} aliassen, "
     },
     "unknown_alias": {
         "en": "{alias} does not currently exist as an alias or known user.",
         "na'vi": "{alias} ke fkeytok nìfkrr",
+        "cy": "Nid yw {alias} yn bodoli fel enw arall neu defnyddiwr yn hysbys.", 
         "nl": "{alias} staat momenteel niet bekend als een bestaande gebruiker of alias."
     }, 
     "aliasparentset": {
         "en": "{newParent} is now the parent user, and {newAlias} is an alias.",
         "na'vi": "{newParent} lu sa'sem set ulte {newAlias} lu stxo set nìteng.",
+        "cy": "Mae {newParent} ydy defnyddiwr rhiant nawr, a {alias} ydy enw arall.",
         "nl": "{newParent} is nu de bovenliggende gebruiker, en {newAlias} is een alias."
     },
     "unprimary_error": {
         "en": "One of those users isn't currently recorded as a primary user.",
         "na'vi": "fo sute txin ke lu.",
+        "cy": "Nid yw un o'r defnyddwyr hynny yn cael ei gofnodi ar hyn o bryd fel defnyddiwr gynradd.",
         "nl": "Een van deze gebruikers is nog niet bekend als een primaire gebruiker."
     },
     "merged_users": {
         "en": "{old_user} and their aliases have been merged into {new_user}.",
         "na'vi": "{old_user} ulte stxo alahe {new_user} lu set.",
+        "cy": "{old_user} a'u enwau eraill wedi cael eu cyfuno i mewn i {new_user}.",
         "nl": "{old_user} en zijn aliassen zijn samengevoegd met {new_user}."
     }
 }