merged the angularjs branch

5 files changed, 3 insertions, 76 deletions

diff --git a/l10n/bg_BG.php b/l10n/bg_BG.php
index af58b09eb..b4975e54e 100644
--- a/l10n/bg_BG.php
+++ b/l10n/bg_BG.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Error" => "Грешка",
 "None" => "Няма",
 "Upload" => "Качване",
 "Folder" => "Папка",
diff --git a/l10n/fa.php b/l10n/fa.php
index fcd0516a5..b38ecdd85 100644
--- a/l10n/fa.php
+++ b/l10n/fa.php
@@ -4,13 +4,11 @@
 "Error" => "خطا",
 "None" => "هیچ‌کدام",
 "Warning" => "اخطار",
-"URL cannot be empty." => "URL  نمی تواند خالی باشد.",
 "Address" => "آدرس",
 "Upload" => "بارگزاری",
 "Import" => "وارد کردن",
 "Folder" => "پوشه",
 "Settings" => "تنظیمات",
 "Add" => "افزودن",
-"by" => "با",
 "Share" => "اشتراک‌گزاری"
 );
diff --git a/l10n/lb.php b/l10n/lb.php
index cca0e4d0c..65ef8a7e5 100644
--- a/l10n/lb.php
+++ b/l10n/lb.php
@@ -1,34 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Feed already exists." => "Feed existéiert schonn.",
-"Error adding feed." => "Fehler beim bäisetzen vum Feed.",
-"Feed added!" => "Feed bäigesat!",
-"Error adding folder." => "Fehler beim bäisetzen vum Dossier.",
-"Folder added!" => "Dossier bäigesat!",
-"Error removing feed." => "Fehler beim läschen vum Feed.",
-"Error removing folder." => "Fehler beim läschen vum Dossier.",
-"Error updating feeds." => "Fehler beim updaten vum Feed.",
-"Feed loaded!" => "Feed gelueden!",
 "File doesn't exist:" => "Fichier existéiert net:",
-"Error updating feed." => "Fehler beim updaten vum Feed.",
-"Feed updated!" => "Feed geupdate!",
-"News" => "News",
 "Error" => "Fehler",
 "Warning" => "Warnung",
-"Add feed" => "Feed bäisetzen",
-"no title" => "keen Titel",
-"no name" => "kee Numm",
 "Address" => "Adress",
-"Upload" => "Eroplueden",
-"Select" => "Auswielen",
 "Import" => "Import",
-"Feed" => "Feed",
 "Folder" => "Dossier",
 "Settings" => "Astellungen",
-"Folder name" => "Dossiers Numm:",
 "Add" => "Dobäisetzen",
-"New articles" => "Nei Artikelen",
-"Share" => "Deelen",
-"Delete folder" => "Dossier läschen",
-"Import feeds" => "Feeden importéieren",
-"Export feeds" => "Feeden exportéieren"
+"Share" => "Deelen"
 );
diff --git a/l10n/ro.php b/l10n/ro.php
index 72331e06a..f295a851a 100644
--- a/l10n/ro.php
+++ b/l10n/ro.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Error changing name of folder " => "Eroare la modificarea denumirii directorului",
-"Error collapsing folder." => "Eroare la ascunderea dosarelor",
 "Feed already exists." => "Fluxul există deja.",
 "Error adding feed." => "Eroare la adăugarea fluxului.",
 "Feed added!" => "Fluxul a fost adăugat!",
@@ -9,21 +8,13 @@
 "Error removing feed." => "Eroare la eliminarea fluxului.",
 "Error removing folder." => "Eroare la eliminarea directorului.",
 "Error updating feeds." => "Eroare la actualizarea fluxurilor.",
-"Empty filename" => "Numele este gol",
-"No source argument passed" => "Nici un argument-sursă nu a fost trimis",
-"Error while reading file" => "Eroare la citirea fișierului",
-"An error occurred while parsing the file." => "A apărut o eroare la prelucrarea fișierului.",
 "Feed loaded!" => "Fluxul a fost încărcat!",
 "Error moving feed into folder." => "Eroare la mutarea fluxului într-un director.",
 "No file path was submitted." => "Nu a fost specificată nici o cale către fișier.",
 "File doesn't exist:" => "Fișierul nu există:",
-"Couldn't save temporary image: " => "Nu s-a putut salva imaginea temporară",
-"Error setting all items as read." => "Eroare la setarea tuturor unităților ca citite.",
-"Error marking item as read." => "Erorare la marcare ca citit.",
 "Error updating feed." => "Eroare la actualizarea fluxului.",
 "Feed updated!" => "Fluxul a fost actualizat!",
 "News" => "Noutăți",
-"Error while loading the feed" => "Eroare la încărcărea fluxurilor",
 "Error" => "Eroare",
 "None" => "Niciuna",
 "Show only unread" => "Arată doar necitite",
@@ -38,32 +29,17 @@
 "Change folder name" => "Modifică denumire director",
 "URL cannot be empty." => "Adresa URL nu poate fi goală.",
 "Add feed" => "Adăugare flux",
-"Error while parsing the feed" => "Eroare la prelucrarea fluxului",
 "Fatal Error" => "Eroare fatală",
 "No files selected." => "Nici un fișier selectat.",
-"Importing OPML file..." => "Importarea fișierului OPML",
-"Not a valid type" => "Tipul de fișier este invalid",
-"Importing done" => "Importarea e gata",
-"Error while importing feeds." => "Eroarea la importarea fluxurilor",
 "Select file" => "Alege fișier",
 "no title" => "nici un titlu",
 "no name" => "nici un nume",
 "no body" => "nici un conținut",
-"subscriptions in ownCloud - News" => "abonări la ownCloud - Noutăți",
 "An error occurred" => "A apărut o eroare",
-"Nice! You have subscribed to " => "Drăguț! Ești abonat la",
-"You had already subscribed to this feed!" => "Deja ești înscris la acest flux!",
-"You don't have any feed in your reader." => "Nu ai nici un flux în cititor.",
 "Address" => "Adresă",
 "Subscribe" => "Abonare",
-"Import OPML" => "Importază OPML",
-"Upload file from desktop" => "Încarcă fișier de pe masa de lucru",
 "Upload" => "Încărcare",
-"Select file from ownCloud" => "Selectează fișier din ownCloud",
-"Select" => "Selectează",
-"Select file from <a href=\"#\" class=\"settings\" id=\"browselink\">local filesystem</a> or <a href=\"#\" class=\"settings\" id=\"cloudlink\">cloud</a>" => "Selectează fișier din <a href=\"#\" class=\"settings\" id=\"browselink\">sistemul de fișiere local</a> or <a href=\"#\" class=\"settings\" id=\"cloudlink\">cloud</a>",
 "Import" => "Importă",
-"Or..." => "Sau...",
 "Add feed or folder" => "Adaugă flux sau director",
 "Add Feed/Folder" => "Adaugă flux/director",
 "Feed" => "Flux",
@@ -77,21 +53,13 @@
 "Choose folder" => "Alege director",
 "Add" => "Adaugă",
 "New articles" => "Articole noi",
-"Mark all read" => "Marchează toate ca citite",
-"Starred" => "Marcat",
 "Mark as unimportant" => "Marchează ca neimportant",
 "Mark as important" => "Marchează ca important",
-"from" => "de la",
 "by" => "de",
 "Share" => "Partajează",
 "Keep unread" => "Păstrează necitite",
 "Delete feed" => "Șterge flux",
 "Collapse" => "Restrânge",
 "Delete folder" => "Șterge director",
-"Rename folder" => "Redenumește director",
-"Import feeds" => "Importează fluxuri",
-"Export feeds" => "Exportează fluxuri",
-"Download OPML" => "Descarcă OPML",
-"Subscribelet" => "Înregistrator",
-"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "Trage asta în Semnele de carte ale navigatorului și apasă pe ea de fiecare dată când vrei să te abonezi la o pagină rapid:"
+"Rename folder" => "Redenumește director"
 );
diff --git a/l10n/zh_TW.php b/l10n/zh_TW.php
index 0f3b7d858..1061ff744 100644
--- a/l10n/zh_TW.php
+++ b/l10n/zh_TW.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Error changing name of folder " => "變更資料夾名稱時發生錯誤",
-"Error collapsing folder." => "收合資料夾時發生錯誤。",
 "Feed already exists." => "訂閱已經存在.",
 "Error adding feed." => "新增訂閱時發生錯誤.",
 "Feed added!" => "訂閱已新增!",
@@ -10,20 +9,17 @@
 "Error removing folder." => "移除資料夾時發生錯誤.",
 "Error updating feeds." => "更新訂閱時發生錯誤",
 "Empty filename" => "空白的檔名",
-"No source argument passed" => "沒有傳遞來源參數",
 "Error while reading file" => "讀取檔案時發生錯誤",
 "An error occurred while parsing the file." => "解析檔案時發生錯誤.",
 "Feed loaded!" => "訂閱已載入!",
 "Error moving feed into folder." => "移動訂閱至資料夾時發生錯誤",
 "No file path was submitted." => "沒有提交檔案路徑.",
 "File doesn't exist:" => "檔案不存在",
-"Couldn't save temporary image: " => "無法儲存暫存影像",
 "Error setting all items as read." => "設定所有項目為已閱讀時發生錯誤",
 "Error marking item as read." => "標示已閱讀時發生錯誤.",
 "Error updating feed." => "更新訂閱時發生錯誤.",
 "Feed updated!" => "訂閱已更新!",
 "News" => "新聞",
-"Error while loading the feed" => "載入訊息串時發生錯誤",
 "Error" => "錯誤",
 "None" => "無",
 "Show only unread" => "只顯示未閱讀",
@@ -42,26 +38,20 @@
 "Fatal Error" => "嚴重錯誤",
 "No files selected." => "沒有挑選檔案",
 "Importing OPML file..." => "匯入 OPML 檔案中...",
-"Not a valid type" => "不是有效的類型",
 "Importing done" => "匯入完成",
 "Error while importing feeds." => "匯入訂閱時發生錯誤.",
 "Select file" => "選擇檔案",
 "no title" => "沒有標題",
 "no name" => "沒有名稱",
 "no body" => "沒有主體",
-"subscriptions in ownCloud - News" => "在 ownCloud - News 中的訂閱",
 "An error occurred" => "發生錯誤",
-"Nice! You have subscribed to " => "太棒了！您已經訂閱",
-"You had already subscribed to this feed!" => "您已經訂閱了這個訊息串！",
 "You don't have any feed in your reader." => "您的閱讀器中沒有任何訂閱.",
 "Address" => "網址",
-"Subscribe" => "訂閱",
 "Import OPML" => "匯入 OPML",
 "Upload file from desktop" => "從桌面上傳檔案",
 "Upload" => "上傳",
 "Select file from ownCloud" => "從 ownCloud 中挑選檔案",
 "Select" => "選擇",
-"Select file from <a href=\"#\" class=\"settings\" id=\"browselink\">local filesystem</a> or <a href=\"#\" class=\"settings\" id=\"cloudlink\">cloud</a>" => "從 <a href=\"#\" class=\"settings\" id=\"browselink\">本地檔案系統</a> 或 <a href=\"#\" class=\"settings\" id=\"cloudlink\">雲端</a> 選擇檔案",
 "Import" => "匯入",
 "Or..." => "或...",
 "Add feed or folder" => "新增訂閱或資料夾",
@@ -79,19 +69,14 @@
 "New articles" => "新文章",
 "Mark all read" => "標記所有為已閱讀",
 "Starred" => "星號",
-"Mark as unimportant" => "標示為不重要",
-"Mark as important" => "標示為重要",
 "from" => "從",
 "by" => "由",
 "Share" => "分享",
 "Keep unread" => "保持未閱讀",
 "Delete feed" => "刪除訂閱",
-"Collapse" => "收合",
 "Delete folder" => "刪除資料夾",
 "Rename folder" => "資料夾更名",
 "Import feeds" => "匯入訂閱",
 "Export feeds" => "匯出訂閱",
-"Download OPML" => "下載 OPML",
-"Subscribelet" => "Subscribelet",
-"Drag this to your browser bookmarks and click on it whenever you want to subscribe to a webpage quickly:" => "將這個拖曳至瀏覽器的書籤列，當您想要訂閱網頁時，點它一下即可。"
+"Download OPML" => "下載 OPML"
 );