Merge branch 'beta'

UweTrottmann · Mar 22, 2013 · a5daa69 · a5daa69
2 parents 59bea78 + 7564b2a
commit a5daa69
Show file tree

Hide file tree

Showing 9 changed files with 409 additions and 403 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ Changelog
 
 All dates are in the European Central timezone.
 
+Version 4.1 *(2013-03-22)*
+--------------------------
+
+* FIX Properly register DashClock extension for stable versions.
+* FIX Remove wrong parent activity tags.
+* NOTICE Latest translations from crowdin.
+
 Version 4 *(2013-03-21)*
 --------------------------
 
@@ -24,6 +31,7 @@ Version 4 *(2013-03-21)*
 #### 4beta4 *(2013-03-21)*
 
 * FIX Remove decor view background to reduce overdraw due to android-menudrawer usage, should very slightly improve performance.
+* NOTICE Latest translations from crowdin.
 
 #### 4beta3 *(2013-03-14)*
 

diff --git a/CREDITS.txt b/CREDITS.txt
@@ -121,16 +121,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 
-SlidingMenu (https://github.com/jfeinstein10/SlidingMenu)
+android-menudrawer (https://github.com/SimonVT/android-menudrawer)
 ---------------------------------------------------------
 
-Copyright 2012 Jeremy Feinstein
+Copyright 2012 Simon Vig Therkildsen
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+   http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/SeriesGuide/res/values-he/strings.xml → SeriesGuide/res/values-iw/strings.xml b/SeriesGuide/res/values-he/strings.xml → SeriesGuide/res/values-iw/strings.xml
@@ -2,8 +2,8 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="episode">פרק</string>
-  <string name="episodes">Episodes</string>
-  <string name="all_episodes">All episodes</string>
+  <string name="episodes">פרקים</string>
+  <string name="all_episodes">כל הפרקים</string>
   <string name="season">עונה</string>
   <string name="seasons">עונות</string>
   <string name="unknown">לא ידוע</string>
@@ -34,7 +34,7 @@
   <string name="lists">רשימות</string>
   <string name="activity">פעילות</string>
   <string name="movies">סרטים</string>
-  <string name="statistics">Statistics</string>
+  <string name="statistics">סטטיסטיקה</string>
   <string name="search">חיפוש</string>
   <string name="add_show">הוסף סדרה</string>
   <string name="preferences">הגדרות</string>
@@ -47,12 +47,12 @@
   <string name="shouts_for">המלצות עבור %s</string>
   <string name="autorefresh">מרענן אוטומטית</string>
   <string name="movies_search_hint">הקלד שם סרט</string>
-  <string name="movies_empty">חפש סרט.</string>
+  <string name="movies_empty">חפש את הסרט למעלה.</string>
   <string name="trailer">טריילר</string>
-  <string name="shows_with_next">%s with next episodes</string>
-  <string name="shows_continuing">%s continuing</string>
-  <string name="episodes_watched">%s watched</string>
-  <string name="runtime_all_episodes">Runtime of all watched episodes</string>
+  <string name="shows_with_next">%s עם הפרקים הבאים</string>
+  <string name="shows_continuing">%s ממשיכים</string>
+  <string name="episodes_watched">%s נצפו</string>
+  <string name="runtime_all_episodes">זמן הריצה של כל הפרקים שנצפו</string>
   <string name="love">לגמרי נינג\'ה!</string>
   <string name="hate">על הפנים ):</string>
   <string name="rating2">נוראי</string>
@@ -101,13 +101,13 @@
   <string name="trakt_notcollected">%s שטרם אספת.</string>
   <string name="add_empty">אין תוכניות או שלמכשירך אין חיבור לרשת.</string>
   <string name="shows_empty">חפש בתפריט שלעיל כדי להוסיף כמה סדרות.</string>
-  <string name="favorites_empty">לחץ להוספת הסדרה למועדפים.</string>
-  <string name="hidden_empty">לחץ כדי להסתיר את הסדרה.</string>
+  <string name="favorites_empty">לחץ לחיצה ארוכה על סדרה כדי להוסיפה למועדפים.</string>
+  <string name="hidden_empty">לחץ לחיצה ארוכה על סדרה כדי להסתירה.</string>
   <string name="confirm_delete">בטוח שאתה רוצה להסיר את %s?</string>
   <string name="delete_has_list_items">לא ניתן לבצע, הסר קודם את %s מכל הרשימות </string>
   <string name="delete_show">הסר</string>
   <string name="dontdelete_show">אל תסיר</string>
-  <string name="no_nextepisode">אין פרק הבא</string>
+  <string name="no_nextepisode">הפרק הבא לא נמצא</string>
   <string name="context_favorite">הוסף למעודפים</string>
   <string name="context_unfavorite">הסר ממעודפים</string>
   <string name="favorited">הוסף למעודפים</string>
@@ -150,7 +150,7 @@
   <string name="remaining">נותרו %s</string>
   <string name="search_button">חפש</string>
   <string name="search_hint_add">שם הסדרה</string>
-  <string name="no_results">אין תוצאות, נסה ביטוי אחר</string>
+  <string name="no_results">אין תוצאות, נסה ביטויים שלמים.</string>
   <string name="search_error">החיפוש הנכשל, נסה מאוחר יותר</string>
   <string name="add_all">הוסף הכל</string>
   <string name="dont_add_show">אל תוסיף</string>
@@ -290,6 +290,7 @@
   <string name="welcome_add_part1">כדי להתחיל, לחץ</string>
   <string name="upcoming_show">%s מתקרב</string>
   <string name="upcoming_episodes">פרקים חדשים מתקרבים</string>
+  <string name="upcoming_show_detailed">%1$s ב-%2$s</string>
   <string name="upcoming_display">בחר כדי להציג סדרות שמתקרבות</string>
   <string name="pref_notifications">התראות</string>
   <string name="pref_notificationssummary">עדכן אותי על פרקים חדשים</string>
@@ -305,7 +306,7 @@
   <string name="widget_label">SeriesGuide</string>
   <string name="hide_watched">הסתר פרקים שנצפו</string>
   <string name="pref_widget_opacity">רקע ווידג\'ט</string>
-  <string name="pref_widget_type">Widget type</string>
+  <string name="pref_widget_type">סוג ווידג\'ט</string>
   <string name="dashclock_extension_label">פרקים קרובים</string>
   <string name="dashclock_extension_description">מציג את הפרק הקרוב הבא מסדרות ה-SeriesGuide שלך.</string>
   <string name="download_stable">הורד SeriesGuide</string>
@@ -357,23 +358,23 @@
     <item>שחור</item>
   </string-array>
   <string-array name="widgetType">
-    <item>Upcoming</item>
-    <item>Recent</item>
+    <item>בקרוב</item>
+    <item>חדש</item>
   </string-array>
   <plurals name="votes">
     <item quantity="one">הצבעה %d</item>
     <item quantity="other">הצבעות %d</item>
   </plurals>
   <plurals name="days_plural">
-    <item quantity="one">%d day</item>
-    <item quantity="other">%d days</item>
+    <item quantity="one">יום אחד</item>
+    <item quantity="other">%d ימים</item>
   </plurals>
   <plurals name="hours_plural">
-    <item quantity="one">%d hour</item>
-    <item quantity="other">%d hours</item>
+    <item quantity="one">שעה אחת</item>
+    <item quantity="other">%d שעות</item>
   </plurals>
   <plurals name="minutes_plural">
-    <item quantity="one">%d minute</item>
-    <item quantity="other">%d minutes</item>
+    <item quantity="one">דקה אחת</item>
+    <item quantity="other">%d דקות</item>
   </plurals>
 </resources>
diff --git a/SeriesGuide/res/values-ro/strings.xml b/SeriesGuide/res/values-ro/strings.xml
@@ -3,7 +3,7 @@
 <resources>
   <string name="episode">Episod</string>
   <string name="episodes">Episodes</string>
-  <string name="all_episodes">All episodes</string>
+  <string name="all_episodes">Toate episoadele</string>
   <string name="season">Sezon</string>
   <string name="seasons">Sezoane</string>
   <string name="unknown">necunoscut</string>
@@ -25,18 +25,18 @@
   <string name="cancel">Revocare</string>
   <string name="share">Share</string>
   <string name="updated">Actualizat la ultima versiune.</string>
-  <string name="discard">Renunțați</string>
+  <string name="discard">Renunță</string>
   <string name="close">Close</string>
-  <string name="save_selection">Salvați selecția</string>
-  <string name="offline">Nici o conectivitate în reţea. Încercaţi din nou mai târziu.</string>
+  <string name="save_selection">Salvează selecția</string>
+  <string name="offline">Nici o conexiune la internet. Încercaţi din nou mai târziu.</string>
   <string name="onlyx">Disponibil doar în SeriesGuide X</string>
   <string name="shows">Emisiuni</string>
   <string name="lists">Liste</string>
   <string name="activity">Activitate</string>
   <string name="movies">Movies</string>
   <string name="statistics">Statistics</string>
   <string name="search">Căutare</string>
-  <string name="add_show">Adăugați emisiuni</string>
+  <string name="add_show">Adăugă emisiuni</string>
   <string name="preferences">Setări</string>
   <string name="help">Ajutor</string>
   <string name="shouts">Shouts</string>
@@ -53,7 +53,7 @@
   <string name="shows_continuing">%s continuing</string>
   <string name="episodes_watched">%s watched</string>
   <string name="runtime_all_episodes">Runtime of all watched episodes</string>
-  <string name="love">Totally ninja!</string>
+  <string name="love">Super tare!</string>
   <string name="hate">Slab :(</string>
   <string name="rating2">Teribil</string>
   <string name="rating3">Rău</string>
@@ -71,17 +71,17 @@
   <string name="show_runtime">Durata</string>
   <string name="show_contentrating">Content Rating</string>
   <string name="episode_directors">Regizori</string>
-  <string name="episode_gueststars">Guest Stars</string>
-  <string name="episode_writers">Writers</string>
+  <string name="episode_gueststars">Invitaţi Speciali</string>
+  <string name="episode_writers">Scenarişti</string>
   <string name="show_airtimeunit">min</string>
   <string name="show_isalive">Continuă</string>
-  <string name="show_isnotalive">S-a încheiat</string>
+  <string name="show_isnotalive">Terminat</string>
   <string name="lastEdit">Ultima editare//TVDb</string>
   <string name="sort">Sortați după</string>
-  <string name="updateall_yes">Actualizare(toate)</string>
-  <string name="menu_update_delta">Actualizare(doar cele învechite)</string>
+  <string name="updateall_yes">Actualizare (toate)</string>
+  <string name="menu_update_delta">Actualizare (doar pe cele învechite)</string>
   <string name="context_updateshow">Actualizare</string>
-  <string name="context_showinfo">Informații despre emisiune</string>
+  <string name="context_showinfo">Arată Informaţii</string>
   <string name="context_marknext">Episodul următor a fost vizionat</string>
   <string name="today">astăzi</string>
   <string name="now">acum</string>
@@ -180,7 +180,7 @@
   <string name="show_library">Show your library</string>
   <string name="upload_shows">Upload your SeriesGuide show list:</string>
   <string name="upload_existing_shows">Upload existing shows</string>
-  <string name="about_trakt">trakt helps keep a record of what TV shows and movies you are watching. <a href="http://trakt.tv">Learn more</a></string>
+  <string name="about_trakt">Trakt ajută la păstrarea unei evidenţe a emisiunilor TV şi a filmelor la care te uiţi.  <a href="http://trakt.tv">Află mai multe</a></string>
   <string name="integration_trakt">If you connect trakt:</string>
   <string name="integration_trakt_items">- add shows from your library and watchlist\n\n- see your recommendations and friends activity\n\n- watched and collected flags are synced automatically\n\n- new shows you watched are added automatically</string>
   <string name="trakt_sync_intro">No shows will be added or removed in SeriesGuide, do that from the show list.</string>