Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 27 insertions, 24 deletions

diff --git a/resources/languages/resources_mk.properties b/resources/languages/resources_mk.properties
index cd47b3d..57dff6d 100644
--- a/resources/languages/resources_mk.properties
+++ b/resources/languages/resources_mk.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,23 +43,24 @@ service.gui.ACCOUNT_ME=Јас
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Волшебник за регистрирање на сметка
 service.gui.ACCOUNTS=Сметки
 service.gui.ADD=Додај
-service.gui.ADD_ACCOUNT=Додај сметка
 service.gui.ADD_CONTACT=Додај
 service.gui.ADD_CONTACT_TO=Додади контакт во
 service.gui.ADD_CONTACT_ERROR=Неуспешно додавање на контактот: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Грешка при додавање на контакт
 service.gui.ADD_CONTACT_EXIST_ERROR=Контактот {0} веќе постои во твојата контакт листа.
-service.gui.ADD_CONTACT_IDENTIFIER=Во даденото поле внеси го контактот кој сакаш да го додадеш во твојата контакт листа
-service.gui.ADD_CONTACT_WIZARD=Волшебник за додавање на контакт
 service.gui.ADD_GROUP_LOCAL_ERROR=Грешка при креирањето на група со име {0} . Проблемот се јави на локалена IO операција.
 service.gui.ADD_GROUP_EXIST_ERROR=Групата {0} веќе постои во твојата контакт листа. Ве молиме одберете друго име.
-service.gui.ADD_SUBCONTACT=Додај
 service.gui.ALL_CONTACTS=Додај
 service.gui.CALL_CONTACT=Додај
 
 
 
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
 # keep the following string short
@@ -57,9 +69,6 @@ service.gui.CALL_CONTACT=Додај
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -68,6 +77,10 @@ service.gui.CALL_CONTACT=Додај
 
 # LDAP
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -83,9 +96,6 @@ service.gui.CALL_CONTACT=Додај
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -97,20 +107,15 @@ plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -119,21 +124,18 @@ plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
 # whiteboard
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+#Enum KeybindingSet.Category
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -145,6 +147,7 @@ plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.